From: Mario Sanchez Prada <mario@endlessm.com>
Date: Mon, 8 May 2017 10:38:16 +0000 (+0100)
Subject: popupMenu: Allow specifying an icon on PopupMenuBase.addAction()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~352
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e38c26894be3719fd502199b770985d6182e28a0;p=gnome-shell.git

popupMenu: Allow specifying an icon on PopupMenuBase.addAction()

This allows passing an optional icon parameter to addAction()
so that a PopupImageMenuItem instance is created instead of a
PopupMenuItem if an icon is specified.

https://bugzilla.gnome.org/show_bug.cgi?id=782166
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 53ab7c100..17a5a911a 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -467,8 +467,13 @@ const PopupMenuBase = new Lang.Class({
         this._setSettingsVisibility(Main.sessionMode.allowSettings);
     },
 
-    addAction: function(title, callback) {
-        let menuItem = new PopupMenuItem(title);
+    addAction: function(title, callback, icon) {
+        let menuItem;
+        if (icon != undefined)
+            menuItem = new PopupImageMenuItem(title, icon);
+        else
+            menuItem = new PopupMenuItem(title);
+
         this.addMenuItem(menuItem);
         menuItem.connect('activate', Lang.bind(this, function (menuItem, event) {
             callback(event);